Treat h and v boxes the same way
authorMatthias Clasen <mclasen@redhat.com>
Sun, 25 Apr 2010 21:12:15 +0000 (17:12 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 25 Apr 2010 21:12:15 +0000 (17:12 -0400)
...we've got the money!

gtk/gtkbox.c

index 76dd255354e2d2afe71ee5fd6f0e9ab3d27812c6..231a30678bf20ba3dfc783cfc6da79a380217613 100644 (file)
@@ -1168,14 +1168,7 @@ gtk_box_get_width_for_height (GtkExtendedLayout *layout,
   GtkBoxPrivate *private = GTK_BOX_GET_PRIVATE (layout);
 
   if (private->orientation == GTK_ORIENTATION_VERTICAL)
-    {
-#if __I_HAD_A_MILLION_DOLLARS__
-      gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width); 
-#else
-      /* Return the defaults instead of calculating in the opposing orientation */  
-      gtk_extended_layout_get_desired_width (layout, minimum_width, natural_width);
-#endif
-    }
+    gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width); 
   else
     gtk_box_compute_size_for_orientation (box, height, minimum_width, natural_width);
 }